Fix file descriptor leaks on arm Android

* exec/loader-aarch64.s (_start):

* exec/loader-armeabi.s (_start): Fix thinko.
Do not merge to master.

diff --git a/exec/loader-aarch64.s b/exec/loader-aarch64.s
index 686a804aa0edc5b0385a14d6380b98bc7f189799..a04e4362ef0c1d87aa17bf94d7f0671d45b5d535 100644 (file)
--- a/exec/loader-aarch64.s
+++ b/exec/loader-aarch64.s
@@ -168,7 +168,7 @@ _start:
        b       .one_auxv
 .cleanup:
        cmp     x28, #-1                // is secondary fd set?
-       bne     .cleanup1               // not set
+       beq     .cleanup1               // not set
        mov     x8, #57                 // SYS_close
        mov     x0, x28                 // secondary fd
        svc     #0                      // syscall

diff --git a/exec/loader-armeabi.s b/exec/loader-armeabi.s
index 2aa52f3e006d8bdba1a1787a498458e87ddb02ef..e0aabdbe734b4d3a79918ada3985e4df2e7b4bfb 100644 (file)
--- a/exec/loader-armeabi.s
+++ b/exec/loader-armeabi.s
@@ -181,7 +181,7 @@ _start:
        b       .one_auxv
 .cleanup:
        cmp     r14, #-1                @ secondary fd set?
-       bne     .cleanup1               @ not set
+       beq     .cleanup1               @ not set
        mov     r7, #6                  @ SYS_close
        mov     r0, r14                 @ secondary fd
        swi     #0                      @ syscall